Merge from trunk.
authorJan D. <jan.h.d@swipnet.se>
Wed, 6 Jan 2010 14:33:57 +0000 (15:33 +0100)
committerJan D. <jan.h.d@swipnet.se>
Wed, 6 Jan 2010 14:33:57 +0000 (15:33 +0100)

Trivial merge